From 11c90c631225ea3bcf4084febf3017d5f8dacd9c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 4 Sep 2020 15:16:44 +0100 Subject: [PATCH] Drop all patches, applied upstream --- ...Include-a-copy-of-the-Apache-license.patch | 223 ------------------ ...loudprint-Fix-redundant-declarations.patch | 26 -- ...-a-warning-if-we-can-t-talk-to-avahi.patch | 26 -- ...-manual-for-bundled-gtk-doc-subproje.patch | 25 -- ...stalled-tests-Fix-the-icontheme-test.patch | 24 -- ...ttribution-and-licensing-information.patch | 79 ------- debian/patches/series | 7 - .../testsuite-Fix-installed-tests.patch | 26 -- 8 files changed, 436 deletions(-) delete mode 100644 debian/patches/Include-a-copy-of-the-Apache-license.patch delete mode 100644 debian/patches/cloudprint-Fix-redundant-declarations.patch delete mode 100644 debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch delete mode 100644 debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch delete mode 100644 debian/patches/installed-tests-Fix-the-icontheme-test.patch delete mode 100644 debian/patches/roaring.-ch-Add-attribution-and-licensing-information.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/testsuite-Fix-installed-tests.patch diff --git a/debian/patches/Include-a-copy-of-the-Apache-license.patch b/debian/patches/Include-a-copy-of-the-Apache-license.patch deleted file mode 100644 index 5323586beb..0000000000 --- a/debian/patches/Include-a-copy-of-the-Apache-license.patch +++ /dev/null @@ -1,223 +0,0 @@ -From: Simon McVittie -Date: Fri, 7 Aug 2020 10:02:00 +0100 -Subject: Include a copy of the Apache license - -4(a) requires giving recipients of the work a copy of the license, and -in any case it's best for source code distributions to be self-contained -(including the full text of all applicable licenses). - -Signed-off-by: Simon McVittie -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2408 ---- - COPYING.Apache-2.0 | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 202 insertions(+) - create mode 100644 COPYING.Apache-2.0 - -diff --git a/COPYING.Apache-2.0 b/COPYING.Apache-2.0 -new file mode 100644 -index 0000000..d645695 ---- /dev/null -+++ b/COPYING.Apache-2.0 -@@ -0,0 +1,202 @@ -+ -+ Apache License -+ Version 2.0, January 2004 -+ http://www.apache.org/licenses/ -+ -+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -+ -+ 1. Definitions. -+ -+ "License" shall mean the terms and conditions for use, reproduction, -+ and distribution as defined by Sections 1 through 9 of this document. -+ -+ "Licensor" shall mean the copyright owner or entity authorized by -+ the copyright owner that is granting the License. -+ -+ "Legal Entity" shall mean the union of the acting entity and all -+ other entities that control, are controlled by, or are under common -+ control with that entity. For the purposes of this definition, -+ "control" means (i) the power, direct or indirect, to cause the -+ direction or management of such entity, whether by contract or -+ otherwise, or (ii) ownership of fifty percent (50%) or more of the -+ outstanding shares, or (iii) beneficial ownership of such entity. -+ -+ "You" (or "Your") shall mean an individual or Legal Entity -+ exercising permissions granted by this License. -+ -+ "Source" form shall mean the preferred form for making modifications, -+ including but not limited to software source code, documentation -+ source, and configuration files. -+ -+ "Object" form shall mean any form resulting from mechanical -+ transformation or translation of a Source form, including but -+ not limited to compiled object code, generated documentation, -+ and conversions to other media types. -+ -+ "Work" shall mean the work of authorship, whether in Source or -+ Object form, made available under the License, as indicated by a -+ copyright notice that is included in or attached to the work -+ (an example is provided in the Appendix below). -+ -+ "Derivative Works" shall mean any work, whether in Source or Object -+ form, that is based on (or derived from) the Work and for which the -+ editorial revisions, annotations, elaborations, or other modifications -+ represent, as a whole, an original work of authorship. For the purposes -+ of this License, Derivative Works shall not include works that remain -+ separable from, or merely link (or bind by name) to the interfaces of, -+ the Work and Derivative Works thereof. -+ -+ "Contribution" shall mean any work of authorship, including -+ the original version of the Work and any modifications or additions -+ to that Work or Derivative Works thereof, that is intentionally -+ submitted to Licensor for inclusion in the Work by the copyright owner -+ or by an individual or Legal Entity authorized to submit on behalf of -+ the copyright owner. For the purposes of this definition, "submitted" -+ means any form of electronic, verbal, or written communication sent -+ to the Licensor or its representatives, including but not limited to -+ communication on electronic mailing lists, source code control systems, -+ and issue tracking systems that are managed by, or on behalf of, the -+ Licensor for the purpose of discussing and improving the Work, but -+ excluding communication that is conspicuously marked or otherwise -+ designated in writing by the copyright owner as "Not a Contribution." -+ -+ "Contributor" shall mean Licensor and any individual or Legal Entity -+ on behalf of whom a Contribution has been received by Licensor and -+ subsequently incorporated within the Work. -+ -+ 2. Grant of Copyright License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ copyright license to reproduce, prepare Derivative Works of, -+ publicly display, publicly perform, sublicense, and distribute the -+ Work and such Derivative Works in Source or Object form. -+ -+ 3. Grant of Patent License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ (except as stated in this section) patent license to make, have made, -+ use, offer to sell, sell, import, and otherwise transfer the Work, -+ where such license applies only to those patent claims licensable -+ by such Contributor that are necessarily infringed by their -+ Contribution(s) alone or by combination of their Contribution(s) -+ with the Work to which such Contribution(s) was submitted. If You -+ institute patent litigation against any entity (including a -+ cross-claim or counterclaim in a lawsuit) alleging that the Work -+ or a Contribution incorporated within the Work constitutes direct -+ or contributory patent infringement, then any patent licenses -+ granted to You under this License for that Work shall terminate -+ as of the date such litigation is filed. -+ -+ 4. Redistribution. You may reproduce and distribute copies of the -+ Work or Derivative Works thereof in any medium, with or without -+ modifications, and in Source or Object form, provided that You -+ meet the following conditions: -+ -+ (a) You must give any other recipients of the Work or -+ Derivative Works a copy of this License; and -+ -+ (b) You must cause any modified files to carry prominent notices -+ stating that You changed the files; and -+ -+ (c) You must retain, in the Source form of any Derivative Works -+ that You distribute, all copyright, patent, trademark, and -+ attribution notices from the Source form of the Work, -+ excluding those notices that do not pertain to any part of -+ the Derivative Works; and -+ -+ (d) If the Work includes a "NOTICE" text file as part of its -+ distribution, then any Derivative Works that You distribute must -+ include a readable copy of the attribution notices contained -+ within such NOTICE file, excluding those notices that do not -+ pertain to any part of the Derivative Works, in at least one -+ of the following places: within a NOTICE text file distributed -+ as part of the Derivative Works; within the Source form or -+ documentation, if provided along with the Derivative Works; or, -+ within a display generated by the Derivative Works, if and -+ wherever such third-party notices normally appear. The contents -+ of the NOTICE file are for informational purposes only and -+ do not modify the License. You may add Your own attribution -+ notices within Derivative Works that You distribute, alongside -+ or as an addendum to the NOTICE text from the Work, provided -+ that such additional attribution notices cannot be construed -+ as modifying the License. -+ -+ You may add Your own copyright statement to Your modifications and -+ may provide additional or different license terms and conditions -+ for use, reproduction, or distribution of Your modifications, or -+ for any such Derivative Works as a whole, provided Your use, -+ reproduction, and distribution of the Work otherwise complies with -+ the conditions stated in this License. -+ -+ 5. Submission of Contributions. Unless You explicitly state otherwise, -+ any Contribution intentionally submitted for inclusion in the Work -+ by You to the Licensor shall be under the terms and conditions of -+ this License, without any additional terms or conditions. -+ Notwithstanding the above, nothing herein shall supersede or modify -+ the terms of any separate license agreement you may have executed -+ with Licensor regarding such Contributions. -+ -+ 6. Trademarks. This License does not grant permission to use the trade -+ names, trademarks, service marks, or product names of the Licensor, -+ except as required for reasonable and customary use in describing the -+ origin of the Work and reproducing the content of the NOTICE file. -+ -+ 7. Disclaimer of Warranty. Unless required by applicable law or -+ agreed to in writing, Licensor provides the Work (and each -+ Contributor provides its Contributions) on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -+ implied, including, without limitation, any warranties or conditions -+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -+ PARTICULAR PURPOSE. You are solely responsible for determining the -+ appropriateness of using or redistributing the Work and assume any -+ risks associated with Your exercise of permissions under this License. -+ -+ 8. Limitation of Liability. In no event and under no legal theory, -+ whether in tort (including negligence), contract, or otherwise, -+ unless required by applicable law (such as deliberate and grossly -+ negligent acts) or agreed to in writing, shall any Contributor be -+ liable to You for damages, including any direct, indirect, special, -+ incidental, or consequential damages of any character arising as a -+ result of this License or out of the use or inability to use the -+ Work (including but not limited to damages for loss of goodwill, -+ work stoppage, computer failure or malfunction, or any and all -+ other commercial damages or losses), even if such Contributor -+ has been advised of the possibility of such damages. -+ -+ 9. Accepting Warranty or Additional Liability. While redistributing -+ the Work or Derivative Works thereof, You may choose to offer, -+ and charge a fee for, acceptance of support, warranty, indemnity, -+ or other liability obligations and/or rights consistent with this -+ License. However, in accepting such obligations, You may act only -+ on Your own behalf and on Your sole responsibility, not on behalf -+ of any other Contributor, and only if You agree to indemnify, -+ defend, and hold each Contributor harmless for any liability -+ incurred by, or claims asserted against, such Contributor by reason -+ of your accepting any such warranty or additional liability. -+ -+ END OF TERMS AND CONDITIONS -+ -+ APPENDIX: How to apply the Apache License to your work. -+ -+ To apply the Apache License to your work, attach the following -+ boilerplate notice, with the fields enclosed by brackets "[]" -+ replaced with your own identifying information. (Don't include -+ the brackets!) The text should be enclosed in the appropriate -+ comment syntax for the file format. We also recommend that a -+ file or class name and description of purpose be included on the -+ same "printed page" as the copyright notice for easier -+ identification within third-party archives. -+ -+ Copyright [yyyy] [name of copyright owner] -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. diff --git a/debian/patches/cloudprint-Fix-redundant-declarations.patch b/debian/patches/cloudprint-Fix-redundant-declarations.patch deleted file mode 100644 index 0bc059bed8..0000000000 --- a/debian/patches/cloudprint-Fix-redundant-declarations.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Simon McVittie -Date: Sat, 8 Aug 2020 14:19:14 +0100 -Subject: cloudprint: Fix redundant declarations - -This is the equivalent of 72c72d0b, but for the cloudprint backend. - -Signed-off-by: Simon McVittie -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2414 -Applied-upstream: 3.99.1 ---- - modules/printbackends/gtkprintbackendcloudprint.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/modules/printbackends/gtkprintbackendcloudprint.c b/modules/printbackends/gtkprintbackendcloudprint.c -index f99bcca..f347fc4 100644 ---- a/modules/printbackends/gtkprintbackendcloudprint.c -+++ b/modules/printbackends/gtkprintbackendcloudprint.c -@@ -71,8 +71,6 @@ struct - } typedef TGOAAccount; - - static GObjectClass *backend_parent_class; --static void gtk_print_backend_cloudprint_class_init (GtkPrintBackendCloudprintClass *class); --static void gtk_print_backend_cloudprint_init (GtkPrintBackendCloudprint *impl); - static void gtk_print_backend_cloudprint_finalize (GObject *object); - static void cloudprint_printer_get_settings_from_options (GtkPrinter *printer, - GtkPrinterOptionSet *options, diff --git a/debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch b/debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch deleted file mode 100644 index a110a09944..0000000000 --- a/debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Matthias Clasen -Date: Sat, 1 Aug 2020 22:42:25 -0400 -Subject: cups: Don't emit a warning if we can't talk to avahi - -The g_warning in this case makes the templates test -fail if it can't connect to the system bus (as is the -case for running installed tests in ci). - -Origin: upstream, 3.99.1 ---- - modules/printbackends/gtkprintbackendcups.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c -index 6453e82..5ca8049 100644 ---- a/modules/printbackends/gtkprintbackendcups.c -+++ b/modules/printbackends/gtkprintbackendcups.c -@@ -3413,7 +3413,7 @@ avahi_create_browsers (GObject *source_object, - if (!dbus_connection) - { - if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -- g_warning ("Couldn't connect to D-Bus system bus, %s", error->message); -+ g_message ("Couldn't connect to D-Bus system bus, avahi printers will not be available: %s", error->message); - - g_error_free (error); - return; diff --git a/debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch b/debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch deleted file mode 100644 index b52debc0d3..0000000000 --- a/debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Simon McVittie -Date: Tue, 25 Aug 2020 10:42:40 +0100 -Subject: docs: Don't build Yelp manual for bundled gtk-doc subproject - -This adds dependencies that would otherwise be unnecessary. - -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2475 -Signed-off-by: Simon McVittie ---- - docs/reference/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/reference/meson.build b/docs/reference/meson.build -index 1654463..905af97 100644 ---- a/docs/reference/meson.build -+++ b/docs/reference/meson.build -@@ -7,7 +7,7 @@ if get_option('gtk_doc') - # for the time being - dependency('gtk-doc', version: '>=1.99', - fallback: ['gtk-doc', 'dummy_dep'], -- default_options: ['tests=false']) -+ default_options: ['tests=false', 'yelp_manual=false']) - - glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') - glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') diff --git a/debian/patches/installed-tests-Fix-the-icontheme-test.patch b/debian/patches/installed-tests-Fix-the-icontheme-test.patch deleted file mode 100644 index daf6f4e4b9..0000000000 --- a/debian/patches/installed-tests-Fix-the-icontheme-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Matthias Clasen -Date: Sat, 1 Aug 2020 22:30:06 -0400 -Subject: installed-tests: Fix the icontheme test - -We forgot to install some of the icons, causing -the test to fail. - -Origin: upstream, 3.99.1 ---- - testsuite/gtk/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index 286c8f3..929d9ca 100644 ---- a/testsuite/gtk/meson.build -+++ b/testsuite/gtk/meson.build -@@ -271,6 +271,7 @@ if get_option('install-tests') - endforeach - - install_subdir('icons', install_dir: testexecdir) -+ install_subdir('icons2', install_dir: testexecdir) - install_subdir('ui', install_dir: testexecdir) - - endif diff --git a/debian/patches/roaring.-ch-Add-attribution-and-licensing-information.patch b/debian/patches/roaring.-ch-Add-attribution-and-licensing-information.patch deleted file mode 100644 index c74373d721..0000000000 --- a/debian/patches/roaring.-ch-Add-attribution-and-licensing-information.patch +++ /dev/null @@ -1,79 +0,0 @@ -From: Simon McVittie -Date: Fri, 7 Aug 2020 10:00:55 +0100 -Subject: roaring.[ch]: Add attribution and licensing information - -OS distributions that take copyright and licensing seriously will tend -to become concerned about source files that appear to come from a -third party and do not come with copyright/licensing information, -and stating that these files are modified is required by clause 4(b) -of the Apache license. - -Signed-off-by: Simon McVittie -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2408 ---- - gtk/roaring.c | 23 ++++++++++++++++++++++- - gtk/roaring.h | 23 ++++++++++++++++++++++- - 2 files changed, 44 insertions(+), 2 deletions(-) - -diff --git a/gtk/roaring.c b/gtk/roaring.c -index 779a47c..d71ba88 100644 ---- a/gtk/roaring.c -+++ b/gtk/roaring.c -@@ -1,4 +1,25 @@ --/* auto-generated on Fri 26 Jun 2020 06:06:51 AM CEST. Do not edit! */ -+/* -+ * Amalgamated copy of CRoaring 0.2.66, modified for GTK to reduce compiler -+ * warnings. -+ * -+ * Copyright 2016-2020 The CRoaring authors -+ * Copyright 2020 Benjamin Otte -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ * SPDX-License-Identifier: Apache-2.0 -+ */ -+ - #include "roaring.h" - - /* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */ -diff --git a/gtk/roaring.h b/gtk/roaring.h -index 3837891..26ab1bd 100644 ---- a/gtk/roaring.h -+++ b/gtk/roaring.h -@@ -1,4 +1,25 @@ --/* auto-generated on Fri 26 Jun 2020 06:06:51 AM CEST. Do not edit! */ -+/* -+ * Amalgamated copy of CRoaring 0.2.66, modified for GTK to reduce compiler -+ * warnings. -+ * -+ * Copyright 2016-2020 The CRoaring authors -+ * Copyright 2020 Benjamin Otte -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ * SPDX-License-Identifier: Apache-2.0 -+ */ -+ - /* begin file include/roaring/roaring_version.h */ - // /include/roaring/roaring_version.h automatically generated by release.py, do not change by hand - #ifndef ROARING_INCLUDE_ROARING_VERSION diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2b2638b9a3..0000000000 --- a/debian/patches/series +++ /dev/null @@ -1,7 +0,0 @@ -testsuite-Fix-installed-tests.patch -installed-tests-Fix-the-icontheme-test.patch -cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch -cloudprint-Fix-redundant-declarations.patch -roaring.-ch-Add-attribution-and-licensing-information.patch -Include-a-copy-of-the-Apache-license.patch -docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch diff --git a/debian/patches/testsuite-Fix-installed-tests.patch b/debian/patches/testsuite-Fix-installed-tests.patch deleted file mode 100644 index d8973c9c2a..0000000000 --- a/debian/patches/testsuite-Fix-installed-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Matthias Clasen -Date: Sat, 1 Aug 2020 21:23:34 -0400 -Subject: testsuite: Fix installed tests - -This broken recently, when we converted the tests -array to a dictionary. - -Fixes: #2966 -Origin: upstream, 3.99.1 ---- - testsuite/gtk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index 1238882..286c8f3 100644 ---- a/testsuite/gtk/meson.build -+++ b/testsuite/gtk/meson.build -@@ -260,7 +260,7 @@ endforeach - - if get_option('install-tests') - foreach t : tests -- test_name = t.get(0) -+ test_name = t.get('name') - conf = configuration_data() - conf.set('testexecdir', testexecdir) - conf.set('test', test_name) -- 2.30.2